From ff5f5b1041d245badfb2c478d1fceafe066a4497 Mon Sep 17 00:00:00 2001 From: "kaf24@scramble.cl.cam.ac.uk" Date: Fri, 16 Jul 2004 20:04:00 +0000 Subject: [PATCH] bitkeeper revision 1.1104 (40f834b0XKxLqwV45R5DkTjgl6UzaQ) Stop compile warnings. --- .../arch/xen/drivers/balloon/balloon.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/linux-2.4.26-xen-sparse/arch/xen/drivers/balloon/balloon.c b/linux-2.4.26-xen-sparse/arch/xen/drivers/balloon/balloon.c index bfeb48924c..cb94867902 100644 --- a/linux-2.4.26-xen-sparse/arch/xen/drivers/balloon/balloon.c +++ b/linux-2.4.26-xen-sparse/arch/xen/drivers/balloon/balloon.c @@ -228,7 +228,8 @@ static int balloon_write(struct file *file, const char *buffer, u_long count, void *data) { char memstring[64], *endchar; - int len, i, pages; + int len, i; + unsigned long pages; unsigned long long target; /* Only admin can play with the balloon :) */ @@ -259,7 +260,7 @@ static int balloon_write(struct file *file, const char *buffer, if (change<0) return change; current_pages -= change; - printk("Relinquish %dMB to xen. Domain now has %dMB\n", + printk("Relinquish %dMB to xen. Domain now has %ldMB\n", change>>PAGE_TO_MB_SHIFT, current_pages>>PAGE_TO_MB_SHIFT); } else if (pages > current_pages) { @@ -267,7 +268,7 @@ static int balloon_write(struct file *file, const char *buffer, if (change<0) return change; current_pages += change; - printk("Reclaim %dMB from xen. Domain now has %dMB\n", + printk("Reclaim %dMB from xen. Domain now has %ldMB\n", change>>PAGE_TO_MB_SHIFT, current_pages>>PAGE_TO_MB_SHIFT); } @@ -279,7 +280,7 @@ static int balloon_read(char *page, char **start, off_t off, int count, int *eof, void *data) { int len; - len = sprintf(page,"%ul\n",current_pages<